random clean up and fixes