tweak to highlighting matching words, added powerline stuff