Cleared a few warnings.
Started adding UnitHeader.