Markup fixes and small changes