Continuing to improve markup errors (issue #8)