More work on the prop / mixture controls
Added normalization function