make Yahoo code less horrid, and fix the overzooming bug