Turn output and difficulty changes
Merge remote-tracking branch 'origin/gordonBranch'