Use more selective spans
Improve suggestion output
Be more selective when displaying suggestions
Silence some knock-down type errors