Fixed Beards fixes in that the messages are now transported across servers. Also added a small bugfix that was found.