Cleaned, debug rivers, more random on moisture