add Time & minor bug fixed