cleanup
removing rand
pathfinding is a pain
fixing conflict