trivial edits
Inc'ed popco version, switched to standard core.matrix build