more command typesetting
Merge branch 'master' into wip-reg