some fixes to production and cleaned up trading