more storming, ensuring a wait before supervisors start, and tidying up how deployment gets defined