Fixed extra character parsing and spacing errors