1.1-rc2: Documentation and refactoring