adding client wait as a cmdline option