minor updates, mostly doc
Merge branch 'master' of https://github.com/changokun/m