Misc cleanup and starting to work on distinguishing between speakers and participants
Merge commit '21bc2f4048c85515a51a65a56484d9ea3c549259' into backupA
reduce debug