clean up matcher, add shading for really small jar