Final thesis - editor fixes