Merge branch 'cf'
Merge branch 'cf'
rework linkage map caption
update fill formatting
some spell checking
Merge branch 'master' into cf