Bug Fixes/Cleanup