Removed use of lists in mate/water balance, minor speed up