fixes and breaks things