Documentation fixes and changes to Collation