Waterwheel enhancements