fixes and collision stuff
fixes and collision stuff