Better Markdown syntax and some re-org