Added 24 hourd format and fixed some bugs