fix power/water use and add citations