cleanup and fixes
Fixes