[fixed] Some accidental file reversions + small spawn change