final changes

Fixes