Updating docs, fixed minor inconsistencies