Many small changes.  Imports, uniqueness, etc.