Fix typo, map function in parser, refactor literals