yet more octave and adaptive level tweaks