correcting a bunch of typos. advanced_merge still not working right