Made it job-friendly, some updated logging lines