bugfixes: termination, correction trade type interpretation