new gunner class fixes