tidying
lake & river output adjustment + tidying