working on highlighting. still a bug