tweaks and cleanup.