some docs and re-arranging