Add timer display and fixes