further work on wikitext