Many undocumented changes. Mostly cleanup.
Added embueing table