minor changes and refactorings
Unstash interflow analysis files
continue working on interflow analysis