More work on wires and some other changes