Updated comments to make use of the new river target.
Prevents faulty comments from causing an infinite loop.