sh-mode improvements