Made a few things better