some final changes

...