Fix the "java." package problem, and add a few features.