small var name changes; .gitignore repair