some more markup changes