fix non-data bug and improve timeleft