Fixing embedding.
Working on fixes.