Worked some on maps and some on spawn system