fixed some collision stuff
fixed