Made a few final changes