commit final fixes