bunch o' fixes