Added functions to ease loading from CLI calls. Also corrected and expanded dataset loading.