fix typos
new build wip
refactor adaptor