Fixed some stuff

small changes, removed trade thing