Minor fixess
Minor fixes, added jar