editing some final changes