Updates to docs + code changes