Addressing various issues in docs and updating to master.