more markup changes