Now with more spelling.
Reorganized header.
Minimized macro fun for Vanilla Edition.