Fixed gates pulling signal from framed wires

- Tweaked recipes
- Some more cleanup