Small changes and fixed .jar file