Xrf data

Some small modifications.
agree. We do not need type checking here.