Finish tradecenter. Fix registration. Other stuff
merge fixes