some cleanup and adding missing things

chores