fixing up a couple things