Better dealing with no connection.
Add more debugging.
Better handling of server conflicts.
Debug output.