Clean remaining datasets, add datasets, update API