multi selection and other nice fixes