Transfer server rewrite and fixes