Use OrderedDict
Better time parsing
Fixed baseline