bunch of doc clean + messaging server first pass