small refactors
update todo
implement timer