fixes on date check and on timezone