Buffer fix and .gitignore update