Wiki rebased and reviewed