Added command mode, plus fixed the dropping of payloads