Added task continuation fix thanks to ziaxdk and some manual tests

Need to add automated tests asap