merged seans changes.  spawn points in map and random spawning