cleanup and fix urls for server