a whole bunch of fixes that do something i don't remember