More progress on wikitables