Fix

Smooth out a few things, import more errors, only grab unique things.