Staighten up trading calculations
Various tweaks to trading