Uplink and gun system, merge fixes