lots of fixes to collaboration