Updated imagery. Reorganized water algorithm.