corrected substitutions and some other stuff
.gitignore