some updates from wikipedia