Updated data import and optimized run function

Small updates including additional checks of import data and an optimization of the run_function()