Added waits to steps, get rid of defunct server stuff (let them die natural deaths)