Updates for simulation on indigo

Also include hydro_dev updates