revert chg-multi.sh.in and apply patch from svn for typos