Update expand-region and other minor changes