Bug Fixes

0 enhancement requests and 6 bugs were closed