Fix #3, and minor cleanup
Used theirs on merge
Add water level to property library
Merge pull request #19 from twhiteaker/master

Add water level, plus minor cleanup