Misc language fixes

Misc language and style fixes