mostly fixed the duplicate messages/ordering stuff?