While working on something else I noticed that the featurematrix has a fewtypos, unless there are objections I'll go ahead with the attached.
--Daniel Gustafsson