Lil bug fixes and clean up