add validations
fix calender