Some schematic changes based on breadboard experiments