fixed some parser bugs -- only local needs to work