Major Fixes
Cleanup