Fixed date selection and added a couple more imput prompts.