Improved documentation and consistency changes