Just some minor changes :)

I really don't know what alterForWhisper is supposed to do