Small fixes
Add more keywords