Clean up and fixes
More fixes and clean up