Fixed a bug and worked on parameter more
Merge branch 'akron/noctrl-cli' of github.com:flowgrammable/freeflow into akron/noctrl-cli