Seriously improved entity collision
Cleaned up and fixed collision