Small changes to output to user. Some bug fixes.
Merge branch 'bugfixing'
Merge branch 'master' into iss62-protocol-integration