mappers connected to parsers

also parser general clean up