final changes
ok, now done