fixes to trading