Fixed more errors in the trade module. The values seem to be wrong, so they need to be tested next.