fixing 0 bug and 12am bug