fixed a few things, now it's possible to track each message correctly if it got delivered