Lots of changes from lab machine. Added some stuff for loading other datasets.