Collate for organization
no collate
fix a bunch of 'typos' ;)