Fix shout replacements, add ignores
Cleanup and optimization