Add spawn points. Fix bug in shortest path calc