Fix nasty bugs
Fix handling of empty fields
Add words
New method of generating mentions