Minor cleanup and .gitignore edits