Rewrote spawns for the third time, rearranged a bit of code