Small fixes and add files into .gitignore