Made some more tweaks to L1/L2.