Fixes to parsing, addition of abbreviation replacement