fixing a couple of fun things