cleanup and fixes
again