more changes

it doesn't freeze anymore, but the collisions don't work properly yet