fixed a few bugs, tested some trade execution