[Parser] Fixed more parsing issues, updating variables