more unspawnable bugs fixed