Editor fixes, preview fixes, import fixes