fixing a few things'