EmbedXode+ upgrade

Changes from the EmbedXode+ upgrade