More Cleanup and Fixes