add some extra am / pm handling