Bug Fixes

22 Bugs and 1 enhancement requests were closed