Documentation and private vars update