Changed some clocking code and the session timeout value