Added waterwheel event, added comments