Bug Fixes

32 Bugs and 5 enhancement requests were closed