Some messaging bugs fixed, yo
ready for big merge