1.4, merging istvan's typo correction, and correcting pnl inconsistency