Merging works. A few of additional fixes.