A lot of spawning/destroying fixes