clean up and fixes
fix 2