Add more cases of validations, tweak dates