Initial fix for the AM/PM time thingy.  Still a WIP