Updated inline comments
Add support for missing times when Time.i is not present
Clean up after reading in all the data