toString and peak improvements