Thanks again Arsheesh! I'll fix these river issues next and post an update in a few days

-Aleksi