improvements to x0r class
improvements to x0r class