Bug Fixes

20 Bugs and 8 enhancement requests were closed