some final fixes 2