ensure all table entries are ordered by Local
Date Time fix some small bugs
merging