merged Alex's documentation updates