Added Jar executable, some bugfixes