Working on debug support
Typo and config change