Added more signals/slots and corrected jobs into tasks