fixing a few things