enhancements (from Mette) for wiki