also connect to the host in normal mode
improved waiting for the xmlrpc daemon to start
code cleanup
code cleanup