fixed timer and finished TODOs