smarter printing
some renaming
rewritten normalizer + renaming