ARC analysis improvements

Just a start