Updated to latest docs
Add some more explanatory comments