support formatting, add PRA and other stuff
add missing fields for msh and fix nk1 syntax typo
Merge remote-tracking branch 'origin/master'