reworked spawns, updated warps