Various minor improvements.
Merge origin/master
Added more verbose output to the refactor tool.