fast conversion CubCellSet -> CubSet + minor bugfixes