HONK & EMP things

Fixing and commenting out