Adding info, fixing markup