collaborators added, plus misc other fixes