added some further markup adjustments