more jingle bug fixes