Refactorings
Merge config defaults, more transparent ping