More clean up and add some datasets