added more mapping and int parsing.