get rid of --browser-wait and --routing-key in favor of sensible defaults, some other tweaks