This work is now done. Please let me know if you notice any funkiness. But everything looks like it's in order.