Bug Fixes

27 Bugs and 4 enhancement requests were closed