cleanup, and highlight bug fix