Some updates to Whirlpool Rider.