misc fixes

all of these things for your pleasure