Add missing @Override annotations
Update .gitignore