Added arc singleton template. Minor fixes.