Several minor upgrades fixes #67 fixes #41
Merge pull request #69 from YWAM-Montana-Lakeside/Water-Tower-1.0

Several minor upgrades fixes #67 fixes #41