several little fixups with wires and labels