Continued refinement of the new ii-tools and bug fixes.