add vi swp to gitignore
update collection field names to get appropriate field properties