Docs and stuff

Pulling in updates from Kartik