Improvements to hilite, main, and star