Bug Fixes

47 Bugs and 17 enhancement requests were closed