Collision and a few minor entity bug fixes