little tweaks and clean up