some changes
timer corrected