cleanings and fixes