update ez_setup, further robustify setup