minor bug fixes and generated .jar