Updates to fnames, data loading and unsupervised template