Added TODOs
Fixed time calculation bug and timer callback usage
Added logging