Fixed up Yahoo! I'll have to do some more thorough testing of this code since I may have broken something.