Styling fixes.
Added more matches.