multiple selection and other fixes