Cleaned up ServerHandle and removed agentURL there.
Some renamings.