Language updates

A few language and style fixes.