more markup formating changes