Shift clicking plus minor tweaks.