Merge pull request #301 from pgreyson/master

partial flow chooser, bug fixes and improvements