Added more input normalization options
Added separate Inorm for SO and DO