Cleanup, fixes, ARC