Added: Better handling and reconnects