Tidy up GlobalVars and get reconnections working