More Docs and other tweaks