a few little fixes based on feedback from #31. Shwooop. Hehe. You have to make those little noises, or it just doesn't work.