Bug Fixes
Bug Fixes, Cleanup