trying to fix a couple things