many fixes for XAS viewing