Made a few parser changes