And yet some more markdown improvements