vi could use original parameters, other small updates
Merge branch 'master' of stico_github:stico/myenv