cleaned up master and updated dataimport