update TODOs
fix the counter timer
more unit tests