fix date now and bug