trued up for safari 6.0 and some wikipedia changes