Working on the normalize command.
Merged remote changes.