Reworked Error filenames, reworked error messages, added step removal
override for Run function