beefed up trade calculation and messages