clean up timer JS, fix leading 0 on 10
fixed merge errors with timer-function