Fix kits only being given once - close #958
Attempt to fix WE selection sync - pass 1
Also added disable switch for selection syncing in dev time.