#49: fixing markup a bit