Added visual mixing width and made definitions more consistent.