fixed final parse errors