+doc addresses multiple comments and adds sources/flows