Fixes from the previous two betas, plus improved documentation.