fixed a message parsing issue and a timestamp issue