improved world serialization and Demo restart