several fixes related to trading