Fixed Entity Removal And Inter-Entity Collision

I actually fixed the Entity collision a small while a go in another
commit but I felt I needed to include it as anyone looking through would
imagine I hadn't been able to fix the problem.