Integrate the "easy" comments from the code review
JNI bindings for tracking