nospawn & bugfix