fixing a couple things