a few final changes