Added a few more touches to highlighting