More plans, improvements to the wiki engine