some very minor 100 char fixes
Merge branch 'master' into #486