Fixes, cleanup
Merge branch 'master' of https://github.com/flowtsohg/mdx-m3-viewer