Move cfs away from ARE; fat client comment + typos fixed