Started change on new way of managing the timer. Other fixes