Fixed bug with keyboard shortcuts ignoring stored time, started working on tracking