improved embedded section and kill more validation issues