-Add column support to pass to editor
-Fix some regressions