Rebuild cached dataset

Plus some bug fixes… more to come.