more fixing markup