some fixes and changes for the new server