Back to macroaveraging, minor docs changes