matrix-spec-proposals

d219cbc9 - apply points from review