more questions added, some answers added.
Sol: "Neeeeeeigh" (hold your horses, something something merge conflicts)