Parser Fixes

Fixed several of the conversion parsers and refactored them slightly.