Another bunch of minor fixes

i thought i had already done this. i am losing my mind.