start fixing markup