fixing a few things
fixing a few things