various cleanup
finished for the day