more progress on tidy, again, again...