some cleanup and some things i forgot