CS fix and .gitignore update