Small bug fixes
Highlight the "final" keyword.