Some bug fixes. Now single page timer works