Add achieved and expected pomodoros. Fix bugs