* General cleanup
* More work on pathfinding. Still not working