fixing a few things andcleaning