Some modifications

Just made some modifications, based on the latest docs under the master branch.