some final changes and comments