Water and what not
totals and merge fixes and more