first pass
got rid of trade references
moved some stuff around