more cleans and fixes