bugfixes
proper jni source