Bug Fixes for deployment

Includes many bug fixes for calculations and instances where the watershed would not update properly.