fixed some grenade switcing bugs