fixed some collision stuff