fix am/pm bug and half past bug

Signed-off-by: rich sollenne <rich@sollenne.com>