Bugfixes and Runnable Jar