Add better coverage for some of the fancy wiki features