more docs and some minor juggling