getting ready for rebase
fixed the clock do display pm