Fixes some animation bugs, added extra parameter to allow extra actions such as whirlwind