Timer changes and comments