ris: more parser tweaks, writer refactoring
more tests