Rules/gear  fixes