Remove extra delay tick, handle number keys