Added time tracking, fixed small title bug