moved a couple variables around

Removed a couple global variables
Minor formatting
v1.55 - changed water added minutes

tracking of minutes of water added was in 15 minute chunks, now it’s 1
minute chunks