small package refactor, fixed date validator