cleaned up the scene by initating vital components insted of them relying on beeing in the scene
Merge branch 'master' into johannes