Michaela's work including code editor fixes
fixing merge conflicts