Trivial edits for better english
Merged master fixed conflict.
final corrections