closes #21  - ugly, no shadows or ripples, but at least it looks like water. Also adjustments for Richard's code review issues