WIKI
few fixes