fixing user bugs
timer functionality added