overall tweaks and clean up