fixes.. TODO squash all these messy commits