better parser, recording diffs for overwritten information