small tweaks and trying to create jar