More changes to the code and gitignore