Bug Fixes

32 Bugs and 3 enhancement requests were closed