fix bugs. change time