new spawner and some fixes