Improvements to Pick-Basic mode.