improved documentation and reordered components