Add in check for Cancelled and Aborted jobs

Now deals with aborted and cancelled jobs as well, in response to #6