
        Fix some clipping and address some merge fallout

803d61c