improvements and shading source jar