more message parsing and such
removed coupling of message and peer