fix some issues + modify email