final fixes

commit !