embedded fixes, need to move fragments out of inner classes.