More work on gokb-generate-matrix command