added explicit wiki name, an initial main and a few other minor changes