fixes and stuff
fixes and stuff