added calendar gem; edited validations