bulk clean up and fixes