added more normalization options

Change-Id: Ic49b9ade2f0148689d02f166c9949309e9581a08