Parser completed, fixes added