fixed two TODOs
Fixed double instanciation during startup