Split arity into field, fixed minor issues.