split into octs first
various tweaks