Cleanup

some more cleanup
Fix

Made it able to build a jar