Documentation and minor changes