Added water tracker (+ some maintenance)