Use new server address, fixed some minor things