other fixes because im awful.