Made some more tweaks to L2 functionally.