tweaks and cleanup