Spawn locations now work properly + minor tweaks