Move entity creation to scene, and misc minor changes