Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
* Couple minor fixes * test * OTR changes * More otr stuff * Some fixes --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>