Gitignore changes
reformat/modify several files