1 and 2 are easy, didn't copy the breadboard view in to icon for the first and darken the connector so it shows up better for the second. Bendable leads are more of a challenge, I've successfully done them before but as usual this time they are being difficult. I'll poke at it a bit more and see if I can convince them to work on the switch..
Peter
