Updated annotations and .gitignore