Changed how river handled, removed launch command