Solved some little bugs regarding am/pm