Add Override annotation.
Fix multi-line listing.
Minor cleanup.
Remove old imports.
Fix a few more warnings.
Merge branch 'master' into tfix