Bug fixes, added fields to Trade