add gnd connection and refine connects