fixed up misc and phrases
Merge remote-tracking branch 'origin'