made a lot of progress in cleaning up the code, just apparently broke the way we were reading in the incoming message