fix up docs and make the immediate stuff more seamless