Imporved. Documentation and extensions