updated talloc2, cosmetics