Fixed date bug
Fixed broken reset