Made trading, and made it work better.
Merge branch 'master' into Trade+Random
test