Redid connections

Rearranged connections and fixed combattester connection