Some work on improving doc markup
(#9)