Added word search + highlight, needs some more lovin' though.