[B] Fix some bug and add email