Taunt menu and minor fixes