Commenting out timer related bugs corrected