Fixed minor bug + made the MessageID a string