cleanup typesetting
Merge branch 'dev'