Adds more server messages support, bugfixes