color tweaks and cleanup