Changed around when the hours/minutes/seconds were incremented, which solves a few minor issues