update Rbuildignore to not ignore all xml files
clean up and tweak to pass tests on check