Cleanup, multi-select fix, and more.