Updating package with Andrews changes, and a few fixes.
Trying to clean up imports.