Parser begun; general updates