WIP #8 Markup contains errors

First attempt to fix markup errors