Bug Fixes

47 Bugs and 18 enhancement requests were closed