some more improvements
jars
one more fix