Added missing package-info modules.
Adjusted the channel connected criteria.

AFDP-111
Slight formatting changes.