Updated for ARC including several bug fixes