More restructuring, fix trade/join