Trade log, more fail detection and fixes.