more progress on tidyr, again