raise river raise and few bug fixes