Fixed preposition bug in parser and formatting