fixed some parser stuff