Plurals to abstract keywords
Several minor fixes
Fixes according to thesis' supervisor