Further wiring updates, fix typos