minor fixes, jni updates
tentatively working contacts refactor