small refactors and fixing the clock

Will move the timer default timer length to a method. it is re-hardcoded to 60 at the moment so it is at least functional.