Bugfizes, improved spawns, sped up