add user & solve some bugs