Added Wikipedia code, but with issues. + Typos and teaks