Includes mouse searches and several minor fixes