Add missing setup & fix typos