ready for big bad merge
Some messaging bugs fixed, yo