updated some of the default wait for environments