add some of the changes from io/parsers