final fixes to server