small style changes and fix .gitignore
merge?
merge