Misc cleanup and starting to work on distinguishing between speakers and participants