tweaks and cleanup of various sorts