Added a few more taunts and fixed a few things