Docs updated and minor fixes