Poked around with the bugs some more