shooter & button class fixes