Some taunts added and fixed a bug