Small fixes from testing the collector.
Improve config defaults and comments.
Additional fixes for advertising the CE.