fixes issue with parsing, and implements some basic mapping