Update for new features, bug fixes and clarity.