Rework repo model
Remove keywords from categories
Edit readme
Fix bugs