Updated mappings! And bugfixes in revparsing