Added more options for Normalize

Even though we all should be using Normalize 2.0.1 by now.