Fixed option selection and updated documentation