changed some function names; updated main() for new watertxt.py