made some final changes