Fixed startup issue
Improved config