Cleanup watershed function
Run all
Fix watershed bug