fixing all of the problems that river had created.