Proposed bug fixes and enhancements with crap cleaned out