Bug Fixes

33 Bugs and 4 enhancement requests were closed