Attempt at collisions and update fixes.

It's so broken and i have no idea why.