Removed a few inconsistencies and further preparation for pathfinding implementation.