Fix #17, and get rid of nasty code to position AM/PM