I fixed the spelling in the merge, but Daniel probably doesn't like the gagging.