few final changes