minor updates to waterwheel