Updating nodes

Update connections and some fixes