finished email edit
fixed rating
1324
merge