Added 24 hour mode, and persistance