Removed unnecesarry joints, added values for parts in schema.  Fixed traces.