Add client/server setup options, improve stability