More Tweaks and Options Added to Account Merge