add atlases and make waiting warning more specific