Remove ~/bin and ~/sbin
Prepend OPT to PATH
Upgrade for calculating vars