improved wiki & modified translation