Adding docs and a few tweaks here and there