Exec improvements + editor