made a few final changes