making some final changes