fixed a few bugs and finished the arc.