Editor fixes and template additions.