added arcs
tweaked a bunch of variables