fixes to my bad fixes