fix tyops and breakage