minor modifications to loading data