Performance fixes (aka fucking X queue based messaging system)