small adjustments to collaboration code, issue #23