fixing up trade and some random fixes