Fix initialization
Adapt initialization of controller
Minor formation changes