Documentation and better output block