cleaned up how we set the uaserver ip
fixed timeout logic to move timeout into helperfunctions
not sorting items that we diff, fixing an issue where this would cause public and private ips to get mismatched