Added and tested lots more recognizer features