Add chapter tags, removed some blank wiki links