Added comments. fixed timer class