replaces logged jobs with regex, other fixes