cleanup and fixes
revert