Added support for stunned players, and other fixes