cleanup, various tweaks