Fix a few small issues, new Linkifier regex
Merge Zixaphir X