Small mods to certain functions, added .gitignore rules