Merge improvements

Nice!