Documentation and other changes