Whispers to common fix

Missing some different types of whispers, and something else was
malfunctioning, so I just re-did that section.
Also removed 2 vars that were declared twice.