changes to some tiny things
blah i hate merging