Bug Fixes

3 Bugs and 3 enhancement requests were closed