Added displaying of the wiki more data.
Merged stuff