Added todo list, and made the output consistently hh:mm:ss
Cleaned up comments, and formatted code a bit better