Small changes to output to user. Some bug fixes.
Merge branch 'bugfixing'