Fix alignment
Remove dummy hack
Additional defenses
Parameterize slug