Reorganize, add support waves, standardize template section.
Autocorrect capitalization errors.