More updates and fixes of wires and assignments.