minor tweakage and bug fixing and killing
Merge origin/master
bug fixed
Merge origin/master