some tweaks to fix copy and paste from vi, etc.