fixed bugs pertaining to 24h.  Fixed timestamp