Incorporate tjunction code
make paths works
Fix adjMat for junctions
fix indent