markup changes
markup fixes to yet to be merged