Cleanup some lines+add better spawnlogic