fixes and such