Refactored the operator key handling.
Made some corrections to number processing.