Still Haven't Fixed Inter-Entity Collision

Did some general fixes though