more work on entities +collision

life lesson: collision isn't that bad if you aren't a dummy