Final CleanUp and Error fixes.