Ok, I feel a little lost on just and heroic deaths, I mean, I know how they are categorized but I though that if it was heroic they come back and if it was just they stayed dead? That was the whole clock thing? Or am I confused?

If it is heroic or just they stay dead, if it was neither they come back. Such as when John got straight up stabbed by Bec Noir, that death was neither heroic or just so he was revived.