quick clean up#3

wzrdtales wants to merge 4 commits into

rjrodger:masterrjrodger/visigoth:masterfrom

wzrdtales:minorFixesNewwzrdtales/visigoth-1:minorFixesNewCopy head branch name to clipboard