more code-kit2 related updates