add group & solve some bugs