Added wires, cleanups, renaming