still porting diffs, parsing errors remaining