multi-select working, bug fixes