Merge pull request #72 from seavor/jay

Jay
fix rearrangement bugs, play with the fee call, price total calculations. bugs remain to be fixed