Fixed getTimer
Improved input