Waterwalk check added, other misc changes