Fixed Time Bug, changed formatting