Rework connection status
Fix message parsing