Collision Detection Complete

Fixed more bugs