Some fixes for the search hilighting. Still don't know how to change the ? and / commands though :/.