Mostly docs and some minor changes