Language consistency

This should provide for more consistent language detection.