cleanup
tweaks and fixes