Arc fix + radius fix.

Arc still not correct!